Repository navigation
fix(git): preserve grapheme clusters in fish-style abbreviations - #790
Merged
sirmalloc merged 4 commits intoNov 5, 2026
Merged
Conversation
This was referenced Nov 7, 2026
Closed
Closed
pcvelz
added a commit
to pcvelz/ccstatusline-usage
that referenced
this pull request
Nov 13, 2026
Upstream: Extra Usage Today widget (sirmalloc#811), newer usage API percent in an idle session (sirmalloc#767), thinking-effort brackets and per-level colors (sirmalloc#777), 256-color grid in Edit Colors (sirmalloc#778), context bar thin line mode (sirmalloc#794), progress-bar widget consolidation (sirmalloc#810), Zed IDE link mode (sirmalloc#800), Check for Updates deadline and proxy fixes (sirmalloc#806), Configure Status Line before an install (sirmalloc#807), emoji and grapheme fixes (sirmalloc#808, sirmalloc#803, sirmalloc#790), Nerd Font icon width in Ghostty and kitty (sirmalloc#801), cache temp file leak fix (sirmalloc#783), plus TUI, timer and separator fixes. Hand edits outside conflicts: - src/tui/components/__tests__/InstallMenu.test.tsx: fork-rename (ccstatusline@ -> ccstatusline-usage@) - src/utils/__tests__/hooks.test.ts: fork-rename (ccstatusline@ -> ccstatusline-usage@) - src/tui/__tests__/App.test.ts: fork-rename; upstream's new menu and preview tests step over the fork's Off Hours row and pin cyan where the fork's Model default is ansi256:124 - src/tui/components/__tests__/ColorMenuPalette.test.tsx: fork deviation - Model default is ansi256:124 - src/utils/__tests__/global-package-manager.test.ts: fork deviation - fixture path uses the fork package name ccstatusline-usage - src/utils/__tests__/migrations.test.ts: fork deviation - flexMode is a post-v1 key in the fork, the v1 sample uses globalBold - src/utils/__tests__/usage-prefetch.test.ts: fork deviation - stub the provider gate (resolveProvider) in upstream's idle-session and daily-spend tests; the fork reads weekly usage from the API only - src/utils/__tests__/update-checker.test.ts: lint import order - src/utils/usage-prefetch.ts: lint - drop the unused fetchUsageData import - src/widgets/WeeklyFableUsage.ts: compat fix - render through upstream's formatUsageBar (sirmalloc#810) so the line mode works; the inverted cursor follows the shared percent-widget rule - src/widgets/__tests__/line-bar.test.ts: compat fix - fork WeeklyFableUsageWidget, weeklyFableUsage field and Fable label; block metrics stubbed so the inactive-block case does not read the real cache - src/widgets/shared/__tests__/usage-display.test.ts: compat fix - the merged cycle has line mode after slider-only - src/widgets/__tests__/ThinkingEffort.test.ts: keeps the fork's real-settings-file harness, ports upstream's sirmalloc#777 cases onto it - bun.lock: upstream dependency updates, re-resolved by bun install - docs/test-retirements.md: ledger for 7 tests upstream replaced (sirmalloc#781 tab as one space, sirmalloc#805 settings write failures, sirmalloc#800 Zed IDE link mode), each naming its replacing test
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #789.
Use the existing
getGraphemeshelper when abbreviating Git branch and worktree names. The first displayed character now stays intact for flags, ZWJ emoji, combining marks, skin-tone modifiers, and variation selectors. The final path segment and unabridged names keep their current behavior.Adds fourteen rendering cases across the existing widget tests, including single-segment names and a final-segment control. The new failing cases use clusters at the start of a segment, where fish-style abbreviation actually truncates.
Validation:
bun test,bun run lint, andbun run buildall pass.No dependency or runtime-floor changes; this reuses the helper's existing fallback for runtimes without
Intl.Segmenter.